testgtk: Convert focus example from GtkTable to GtkGrid
authorBenjamin Otte <otte@redhat.com>
Wed, 28 Sep 2011 03:03:20 +0000 (05:03 +0200)
committerBenjamin Otte <otte@redhat.com>
Wed, 28 Sep 2011 03:29:50 +0000 (05:29 +0200)
tests/testgtk.c

index 932e6b7262742915dbac1ee2a9ad3341c086eee2..44a176d86886e1453abbfa56624a9eb911c9e570 100644 (file)
@@ -5250,10 +5250,13 @@ create_flipping (GtkWidget *widget)
 static GtkWidget*
 make_focus_table (GList **list)
 {
-  GtkWidget *table;
+  GtkWidget *grid;
   gint i, j;
   
-  table = gtk_table_new (5, 5, FALSE);
+  grid = gtk_grid_new ();
+
+  gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
+  gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
 
   for (i = 0; i < 5; i++)
     {
@@ -5268,19 +5271,16 @@ make_focus_table (GList **list)
 
           *list = g_list_prepend (*list, widget);
           
-          gtk_table_attach (GTK_TABLE (table),
-                            widget,
-                            i, i + 1,
-                            j, j + 1,
-                            GTK_EXPAND | GTK_FILL,
-                            GTK_EXPAND | GTK_FILL,
-                            5, 5);
+          gtk_widget_set_hexpand (widget, TRUE);
+          gtk_widget_set_vexpand (widget, TRUE);
+
+          gtk_grid_attach (GTK_GRID (grid), widget, i, j, 1, 1);
         }
     }
 
   *list = g_list_reverse (*list);
   
-  return table;
+  return grid;
 }
 
 static void